auto upstream
authorJoakim Verona <joakim@verona.se>
Sat, 22 Dec 2012 14:26:55 +0000 (15:26 +0100)
committerJoakim Verona <joakim@verona.se>
Sat, 22 Dec 2012 14:26:55 +0000 (15:26 +0100)

Trivial merge